Charts - Typos and cleanup