Tighten up routes, better validation for mml