Added particles and other improvments