more fixes to spilt and insert
added more changes