Fixed Editing Issue, Some current location, some data transferring errors remain