Completed step2 and fixed a couple of errors