touch ups
merge fix