Merge "small drive-by fixes while looking at the code for documentation purposes." into studio-1.0-dev