some more fixes

a little bit more of a cleanup