Corrected some variable names to reflect latest updates
Fixed plotting routine
Removed step parameter from variables
Removed step parameter from JSON