Several new classes and functionality improvements
Minor convenience changes