Fixed puzzle and level classes

Fixed puzzle and level classes