data-html and data-if

- data-if is now working
- data-html is now working
- Minor other things