small tweaks / fixes on server