Marijuana Industry Steps Up on Edibles, Retailing