fixed edit 
Some issues fixed..