CIFAR-10 maxout result, and small miscellaneous changes