Dev Some more routes cleanup and fixes.