updates per 2014-12-16 comments