tidied some routines, added more versions of certain plots