Improved DocBlocks; replaced router config.