Review join and code called at particle join!! Critical!
Also, a few fixes and upped performance a small bit.