some final tweaks