Fixed bash string concatenation derp and some oth minor fixes