fixing
more fixes