Fixes/updates to improve accuracy