very minor updates from final fix round 3