lock tweaks

Changed how locks are modified so all modifications occur through
NewDimData
Merge remote-tracking branch 'upstream/StevenRS' into updating