wip fixes for editing self