bug fixes
HTML5 semantics cleaned up