Various updates (fixes #34).