Move baseball
fix warning
update scripts
update scripts
update scripts
update comments
clean out junk
Merge remote-tracking branch 'upstream/develop' into develop