updating comments and added a few new commands
merging local with remote