PiCLusterClient is also working :)
Fixes and cleanup.