Added defect point count.
No owner tweaks.
Removed nice substring stuff.