Editplot is working now. This is the commit before merging the branch back into master.