Few changes and added some comms