Minor updates to CAM

git-svn-id: https://heledd.googlecode.com/svn/trunk@93 76c5b99b-c41f-f9d4-998d-396bb8324e16