clean up
clean up, fixes