Added descriptions and cleaned up GUID/targets