edit bugs fixed