misc fixes + address discussion