improved blank-line, tab handling