updates
more fixes