some more features, but gavrilo and the reg tests are now broken again