small updates based on Tom's request