more cleanup
clean up; leftover bugs