minor improvements on theme