Verbose mode and calculation are fixed