added some make-life-easier changes