Some speed and size tweaks, avoiding floats
Trimmed deadweight, tidied up gammas