Bug fixes

Some bug fixes, plus data screen-printing added.