Some major bug fixes :D