updated routing

general cleanup etc