Housecleaning

and a couple other tweaks.