better gap handling, reverted options changes