small changes + fixed editing bug + fixed #4