Marion County under tropical storm watch as Elsa's track shifts