added feature: edit entry, improved locker