fix for remote/lock remote/unlock, and two comments