Various updates

Updates are as the three commit messages describe.