Some cleanups, and added remaining core chart types