bug fix in 2DConv and other small changes to makefile