More features and tests.