Fixing bugs and adding in a 404