missing file
some more fixes/refactors