update code, added uneditable functionality, fixes #13, #14