Added a bunch of new features.