more tweaks
final tweaks