fixups
Don't notify chain completion until all entries have completed
Fix JS from tokens