Little amount of fixes to make it actually produce sensible results.