Fixed chart legends
Fixed num bug
Merge