Fix bugs when adding objectives

Incorrect indices used when adding objectives
means that other objective counts are
inexplicably increased.

The brush was also not set to the
correct mode when adding objectives.