candy.h and candy.cpp update