Additiona updates

Working through the outstanding issues