some routing mistakes. there are more to fix