Cleanup/fixes

I forgot that Shared.GetSystemTime was broken in the last build...
Merge pull request #121 from Person8880/develop

Cleanup/fixes