added filled in normalize particle function and fixed name conflicts