fixed version / better blank-line handling