fixing bugs and adding changes to user editing