Tidying up, add some stuff