Updated avr/05 to make it a bit cleaner and smarter. Still need to finish doco