Added stuff, fixed stuff, tidied up