Bugfix
Minor rewrite
Fix variable expansion inside strings
fix bug