fix Float number bug. fix one macro bug