Major particlecontroller fixes