Bug Fixes

Fixes some issues with verifying and stuff.