More Updates to the structures and coding.