Adding -l, -c options and averages