added new data structure for faster look ups
fixed data struct, and modified particle