Bugs and starting edit