misc updates
wip