Fix a couple minor bugs and add more sample runs.