Efficiency 1.16d

Fixes #1498, Fixes #1499, Fixes #1497, Fixes #1501