added EDD integration for licensing, reduced some code