Empty lines not indented; minor changes to FS