Made changes for bringing up-to-date for current Kotti, 0.8a vintage.