Continued Working on Verification, Fine-Tuning

Getting there, it's working overall although there are a few things to
tidy up.