merged and fixed 404/403

I hope this works, I forced the 403 commit and added my changes on top.