bugfix: delimiter hardcoded to "_"; minor changes