Commiting a few more changes in