all tests passing, almost ready for 0.8.1