fixed up solve and puzzle fragment