More accuracy-related tweaks. Fixes #4.