A lot of bug fixes :D