renamed concat and misc. changes