Various bug fixes. Had to add arguments for machine names and architectures.