Way low on both. However, the ratio between your answer to #2 and your answer to #1 is almost exactly right.