updated CSRouter and ServerRouter, also added some logging