More bugs squashed :D