More verbose output
Adding small int support