Test complete, correct minor bugs