CoC snapshot update 20141127

Few bug fixes.