Bug fix (partially masked by previos bug) + modifications in printout - to be clearer.