misc changes, and more particles ;o)