some fixes
unicorn welcome