committing fixes before drastic clean up