update charter, and dumb fixes to vim