still got some stuff to tidy up but all seems ok