Couple more improvements. Final - about to send it.