Reverted changes adding adaptive step size

Also fixed whitespace/line wrap issues
Removed accept_window field from options