Added routing rules
Removed some stupid errors