last tweaks
fine tuning