FIxes and getting output ready for grading