some final changes

final changes