Cosmetic changes and better error estimation