various fixes to the CNN model