Fix schema errors, unit now saves.
More ideas.