Fix some error, and basepoint to rank