changes, fixings, and cleanup