Woohoo, bugfixes already