Checker Improvements

Improvements in the Hash checking - to remove the hash from the actual
file.