fix: hard to unlock, also checks for distance