another few minor fixes.