Lots of updates now almost ready for release, just fix the permissions
Merged from active site