Global update 04.02

Global Resharpering, bugfixing.
Hooking up with git.