Fixed which= in plot(), refactored plotting to be more sane