Start of particle testing and drawing fixes