more printing and some small fixes