Update Billmonster to the latest Clint

And few other updates, see the commit logs.