Fixed some things, need cleanup...