Minor changes in output dispay etc.