Lots of things now working.
Merge branch 'minor_changes'