Fixed splicing and removed "box" + minor other changes