fix celery origin, detect nonlocal if no sw8 head (#129)

2 files changed