A lot of barclamp improvements