Version 1.2 upgrade with numerous fixes and adds