some improvements
more progress on the server