fixed merge conflicts
removed stupid htmls
big commit to ntouch