removing Armins fix, a couple of ugly fixes to compensate for bad data