some more language changes (props to @mickey)