my changes
merged
cleaned up some things