Fixed some bugs in mod 6 submission