Included extra arguments in functions, for a part of Torenbeek, to switch between unit systems and types.