Minor updates and added comments