progress report and some more server changes