fixes + improves
Merge branch 'master' of https://github.com/yakoval/ht
IMPROVES, FIXES