minor ongoing bugfixes
Merge git+ssh://github.com/josephramsay/LDS