Verifications

Fixes and some code re-org.