merge small studio sep 4 edits with master branch from kal pull req #22