Almost ready for release - checking for bugs...