More bugs fixed for more accurate results