Free work time

Finished both object combination puzzles. Added another room. Minor
fixes