Few bug fixes and precision improvements