more fixes
more debug