Playground refactoring and fixes
Merge pull request #1411 from priand/playground2

Playground refactoring and fixes