Fix all the bugs! \o/