Fix indivudal machine shell history and some cleaning up