Fixed output buffering, adjusted routes