HTML escapes & misc. fixes
Merge pull request #280 from emanwebdev/html_fixes

HTML escapes & misc. fixes