Add TODO and tweak whitespace
Fix asset host bugs