That is a very good summary. If you guys are heading into Acts 2, I would like to interject something. Pardon me if I'm a little awkward in my timing.
There is a lot of controversy concerning Acts 2:38
"Then Peter said unto them, Repent, and be baptized every one of you in the name of Jesus Christ for the remission of sins, and ye shall receive the gift of the Holy Ghost."
The problem is, of course, the apparent implication that water baptism initiates something. There are no shortage of groups that have used this as a baseline for what I believe is a flawed doctrinal stance, one that is actually antagonistic to the concept of grace.
I believe that the real thought expressed is about baptism being a reasonable response of obedience, something done on account of sins being remitted rather than causing that remittance. A while back I heard an analogy with regards to this that I think is very good. If you were to see a poster that reads
TXPIPER
WANTED FOR MURDER
this could be interpreted two ways. The intent of the message is to announce that this guy has killed someone and needs to be brought to justice. A misinterpretation might assume that someone wants a murder to be committed and is soliciting tx to do the job. The same concept applies to 2:38. The reality of why people are really saved is in verse 47:
"...And the Lord added to the church daily such as should be saved"
Christ is ever and always doing the saving.