Various changes, to keep repo up-to-date with server.