Updating to almost ready for release