Merge overflow fix and tweak padding #284

Closed lewish closed 4 months ago