fixes #259
fixes #214
minor fixes
fixes #268
fixes #164
Merge pull request #274 from CosmoCMS/james

Fixes for numerous areas