upped efficiency & remove overhead

content is being checked before further processing, errors are more
clear. Minor terminology changes.

Readme updated.