wip; pending assets and some cleanup