Fixed plotting and loading bugs