Add concat via '&' and some number cleanup