Fixed bugs, testing completeness