made some more fixes