Close options + listen +fixes