Fix ALL the things
Rerouting, errors and security