lots of little cleanup
2.1.1