fixing most of edit issues