Final updates and tidy