fixes after refactor