real server / fix bugs