fixes in
more fixes