cleanup and some documentation on some classes