-minor bug fixes
-cleaned some files