More logging (still not enough)
Fix basic rounding errors