More tweaks - all but printing seems to be working.