further work on abundancy control and new cli options