Pushed latest module changes

See "master" branch
Also: cleaned up 404 examples, not really useful for a demo page ;)