Framework Update bug fixes
Versioning Update