Bug fix
Continuing server development