fix
html generation
merge or something
encoding fixes
reorg stuff
reorg