some Editing bugs fixed.