cleaned up tpl-server a bit more