some last tweaks