Fix to assets loading and TODO update