Lots of fixes and additions for v116