Something minor
merge
Fixed several issues
merge