Staff fixes

Loads of fixes and changes to update the system.