everything passes tests. looks ready for 2.1.0