organize some things and add others