Listen and port plus some config additions

Change-Id: I9271ac97b74a6e81328514e1ea306b31d48fea28