fixed a few missing refactors