misc indent fixes + "note" support