Updated several files with routing errors