Fixed up issues from Mike, added fixed up a few other things. Added some details to the core record classes.