Some minor customizations

Add some experimental, not-ready code.