fix weird particle movement bug causing stacking, fix git problems too