Some more improvements on AVR