some fixes + better printing.