More misc improvements