Updated editor; standalone player