Several small updates

(February 24, 2016)