Page not found support + a lot of fixes