added glys + fixed up routing