tidied up some erroneous stuff