major update from server setup scripts