misc changes - working on new lock code