[samjsharpe] various updates