Added fix for cmake lib naming.  More review tweaks.