fixes that Liam suggested have been implemented