Bug fixes, 71% code coverage