Added particle effects

Added particle effects
Made some changes to other code which were mostly reverted