html escape added + minor fixes