reworked some aspects of internal parameter handling