latest changes
more fixes