Fixed ALL the bugs! (well, not quite)