Fix #42, fix #40, fix #35

FIx hyohenation and overflow issues.