#83: replaced most default values with defined constants