Fix for add line label
Update to Rice 2.3
Style tweak 3