minor code cleanup
fixed install scripts ${var} substitution