Various updates

Fixes #81