combining strings not arrays + other minor changes