settings adjustments and a few minor things