Option handling improved.