Complete ninjanode clint
rename stuff