Summary fix

better to review it per commits as it contain also small rubifying