fixed a deadlink and adjusted 'this' references