Playground refactoring and fixes