More supplication corrections and printing support