Adds many little enhancements and bugfixes