Fixed final minor bugs, deleted some garbage