Typos and printing improvements