remove extra prints/junk. Add some organization comments
fix merge conflicts