added some, changed others