Server finished and bugfixes