minor suggestions after fast read