Updates

Several updates... See commit messages for details.