Fixed bugs (which I didn't cause, despite what the others will claim :P )