fix and rework defaults