minor last changes
final commit