Combined some things, added some things.