bug fixes and enhancement to creator app