particles upgraded and fixed
code cleanup