added many comments
removed diffthis and diffupdate mappings