Fixed errors.
Fixed some collision issues
Merge branch 'JesseMOE'
Merge branch 'landonMOE'
merged
starting values set