fix #5
small changes + fixed editing bug + fixed #4
fix version
finally fixed #5 (?)