Small fixes/features

- output packages to delete
- reorder output
- make things faster