A few more updates to the code along with a few comments