Here's one comma rule. If a conjunction is connecting two complete sentences, use a comma. If the phrases before or after the conjunction are not complete sentences, then you don't use a comma.

I wish that you could have gone to the movies with me, but I understand that you were sick.

The students couldn't believe how fast the summer passed and that they would be returning to school shortly.