Capabilities

Add content to capabilities dict.  Do some renamings. 

Also some code edits.