minor assorted fixes + improvements