minor tweaks for routes and data cleanup