Final fixes/refactoring for the RELEASE!