Lots of Updates

This has lots of little updates that help the package validate its numbers coming in.

Furthermore a great contribution from Cannonb4ll has made it much better for the migration stub.

Thanks again !