Fix'd some stuff for submitting