commented out some stub lines of code
added shutdown_wait to config
typo fix
typo fix
typo fix
typo fix