start fix-up in insert
change queue structure, add more test