finishing off and moving bits around