misc cleanup/additions