verification.

Fixes #48 
Fixes #46