Fixed bug related sample appearance in plot. Minor cosmethics changes