Tweaks to core. Initial chart work.