tidy up
Note on current status
merge