cleanup
added stuff
rearranged