404 file addition & Bug fixes

404 file addition & Bug fixes