fixed source assignment and added string interpolation suppor