more fixes + address comments