small changes, filtering prior to local inf. calc