Citing the number of upvotes on Brian M. Scott's comment, I believe it's safe to say your answers are correct. I would just like to officially answer this question to remove it from the Unanswered Questions queue.