fixes from refactors