Higher numbers
Misc fixes