copying over a few missed changes
more wip updates