Just a little update for some bug fixes :)