remove obsolete option
avoid infinite loop
some small fixes