Issue #12 tweaks to comply with HTML Val