10/21/14 - minor fixes and updates to entropy