changed warnings and pretty-print