small updates by Greg