cleaned up
more cleanup and added TODO's