celery integration, bug fixes