A small merge request of a few changes I did in Puzzle back in June, so that you have the "newest" changes.