add port & charset
commant and better locations