minor server changes, todo comments