Fixed some errors and removed crap