more odds-n-ends cleanup