Some things added and/or changed.