More correct decorator attribute calling, plus some comment clarification