cleaned up
bugs