Slight changes to fix spacing and overfull hboxes