Better graph labels
Fix lock