Fix righting moment calculations and split up lumber workings