Disruption: fix some bugs on the whole at chain

yes it is pep8 compliant