Updates to fix bugs, new ploting script.