fixing config
adding more teleport locs
Merge remote-tracking branch 'origin/master'