added minor configuration options