Major changes to wrapping mechanism and print()