Added particle generator + bug fixes