Tweaks and improvements; removal of unneeded plotting.