Well then.
Forgot some additions.
Some updates
Merged updates from master