R76 updates (fixing bugs)