More improvements and add Discussion section