Added more entities; improved HTML sample page.