Final fixes and Version Number