A few minor bug fixes and manual update (20160408)