fix routing and other crap