Tidied up. Still struggling with some of stubbing