bug fixes
try using my new routing framework