puzzle tweaks
more progress on puzzles