logger: bugfixes
Also: started annoting "locate"