lot of bug fixes and added accuracy data