First test with a few bug fixes.