Improve puzzle loader

Allow comments, indenting.