cleaned up
clean up and bug fixes