more ltr fixes and new locking mechanism