Do you know the mamamama trick? Wait until he is really pissed. Then gently tap the back of your finger on his mouth when he is crying to make a very entertaining mamamama sound. They don't really like that, but it turns crying time into playtime for the parents. Do not overdo it or you might find him doing it to you in about 50 years.