Updating code coverage, fixing minor bugs