Add extra checking for options
Change keywords
Change for server listen
Typo