fix entangler bugs
bug fixes
document fixes and update version
Merge branch 'develop'