Many bugfixes + html