Insert subtype bugs fixed. CoreData not biting for now.