fixed some things and organized better look at some classes