Progress

These are the few changes I have made on the code.