Tidying up terminal output
Lazy commit – various updates