Distributed Computing Lab Fixes

Done with changes - ready to be merged