rework statement parsing
correction resolving