More bugfixes + get server working