Fixes and better printing.