Final Puzzle Fix + Tweaks