more bugfixes and html security