Fixed lots of insert bugs - still doesn't work for 10