Test, better routes & fixes