last updates
final fixes