Fixing two minor bugs, adding comments