Bug fix and add candycane

Some fix