Saving architecture, and a load of small changes. (Closes: #44)