Fix for various inconsistencies and errors.

Many statements were lacking proper punctuation, inconsistencies where
entity was being used in one location and living entity was used in
another location, and overall cleanup was needed.