fixed import bug, added job hooks
better make fix