some locking typos, cleaning stuff up