misc stuff to finish this round of refactor