fixed egregious typo
cleanup
initial set of fixes