further improvements and fixes in ABT algorithm