wip
Tidy up
Small improvements