Feature improved cnn

Hopefully improved the state of Cnns, with more options and flavours, tests and documentation.