final bug fix and numbers tweak