few tweaks to improve accuracy