General locale cleanup
Merged
Add reference to controller to Chart
Numerous fixes. Including charts.