Updated lots of things...
Merged