some more fixes + debug