Many changes/additions to particle system, some additional functions