tidied and updated defaults