Improved doctype (preliminary) and added entity declaration