more accuracy improvements