final tweaks
final