More activity from edlockman

Nothing else from edlockman yet.