Better string handling, patched ARGV error in demo