Updates
more fixes