fixed something
more fixes