more changes per review.
more changes per review.

atlas0fd00m/vivisect,vivisect/vivisect,cmaruti/vivisect,atlas0fd00m/vivisect,cmaruti/vivisect,bat-serjo/vivisect,bat-serjo/vivisect,vivisect/vivisect,bat-serjo/vivisect,vivisect/vivisect,cmaruti/vivisect,atlas0fd00m/vivisect