more editor and player work