Add overflow handling for pre
Formatting fixes