more improvements and better printing