Fixed crypto issue.  Improved blocking behaviour