Added drawing of particle, and updated poorly writen drawing code