Improved bonus score mechanics

Changed where operation state is changed. Was originally in the wrong
place.