Added tons of new features