moved verboseness into seperate calc funcs
fixed merge conflict