few structural updates