server.py-improvements