A whole mess of changes. Not really sure. Sorry!
Merge branch 'master' of https://github.com/kgullikson88/TS23-Scripts