Added a bunch of cool features