- add output archive
- tidy up a bit