cleaned up some things and reorganized