add git pull and other various changes
cleanup some old & add some new settings