updated chart type; changed to single quotas; removed unneeded vars;