wip
minor refactors