fix macro bug
fix newNode bug and main