general clean up, fixes 9