further accuracy improvements