Peek command updated

Need to check three things. See comments for more details.