reverted refactoring of StatusData function to avoid a BC break
fixed various code errors