some more language, some style updates