Various improvements. DRY. Only one instance of EDD Software Licensing needed. Etc..