Bugs Fixed for Second Deadline