Cookie monster and minor improvements