Organize and fix some things