Minor bugfixes. Had a wrong OR statement in convolution().