Cleanup, mutliple small fixes, prep for branching for refactor