Minor improvements to candy factory