More Updates to the structures and coding.
Merge pull request #2 from Reimi/master

More Updates to the structures and coding.