puzzle fixes