merge small changes made on pentomino copy, make sure none of the demo parsers break.