Version updates and minor changes

Version updates and minor code adjustments to reflect other versions