Removed hard-coded version refs, and added some inline comments.