lazy server fixing, tests passing \o/