final tweaks
final tweak and merge