Fixed little bugs here and there, still a bug in the plots

Signed-off-by: Ian Bell <ian.h.bell@gmail.com>