some minor fixes and no annoying NPE anymore.
added two xhtml files for future work