various detail tuning and fixes