Added particles + small fixes