Merge of Yannick's black hole changes
This is a duplicate of !1084 (closed) with only the BH related changes.
@dc-bahe1 I think I got everything. I have also modified the other relevant parameter files. If you want to have a final look, here you go.