fixes routes problem, and more