further improvements and test-abilities