some cleanup, fixing display of Loading msg