merged main into feature branch and adapted to new way of cli

merged main into feature branch and adapted to new way of cli #434