Dev230104

dear @philipp.sommer, I hope everything is okay with you. In addition to adding two new features, I also revised the comments and docs. Please, if feasible, review the MR.