Accuracy and fixes

Improved diagnostic accuracy plus bug fixes and performance improvements.

• Improved diagnostic accuracy
• Bug fixes and performance improvements