more minor fixes….