Fixed issues with rmi from different machine
Cleanup. Plotting