more language/structural improvments