deleted some things
messed up some stuff
another about class
commited from master