more tweaks and fine tuning