Improving errors... slowly.