progress
more fixes