Cleaned up some particle effects, working on GUI