Fix recalculate algorithm and point adjustment