pretty output + fix cathing errors