CoC snapshot updates 20141116

Bug fixes and polish on Ingnam.