OK, thanks very much for your help.
I've made those updates as well, and I'll go back over them again in finer details once I have a first pass of the entire printer working.
At the moment, one additional thing keeps breaking down after I fix something else.