Capabilities

Add content to capabilities dict.  Do some renamings. 

Also some code edits.
I listed them all explicitly only because I wanted to specify the order