refactored conv_net
before dropout changes