More tests. Bug fixes. Minor improvements on the convenience script.