took changes from other branch that I needed
fixed string interpolation a bit more