Fixing bugs and routes