chg: minor fixes, mainly cleanup