Fixed more stuff, mostly minor changes
Smaller bugfixes
Devised new algorithm to upload OGS
More informative warning output