various changes to server and modules