Candle Wood: Fixing some bugs (again)

Second attempt to fix the bugs with the achievements