Puzzle bug fix and some safekeeping