Reorganize and add some stuff