Update version to 1.0.0.Final and make minor updates/fixes