Two minor improvements I'd Love to see...