added unicorn, separated jobs
updated vars