Organize and add a few specs