fixed plus/minus bug and refactored plus/minus tasks