activation key enhancements

and many more, sorry