Odds and ends

Nothing major, improvements I can't remember