various tweaks

;