Fixed EVERYTHING (minus the bugs)