Fixed ALL the bugs (almost)