Cleanup, also minor user experience changes