more fixes + address comments

fix

fix2