Alpha release

Residual changes for Switchboard. Still needs testing on Win64bit. Sorry this is massive.