fixed bad commit and fixed another bug.