some tidying
took out date, fixes #393