make some improvements/samples ready