All changes, mainly implemented editing some more