Some minor tweaks - fixes 404 problems
Still broken, but on the right path? On a path, anyway.