Bringing charms up to code and fixing basic problems.