last changes kind
final fixes