Fixed a bug where the upload policy was hard coded to 2015, implemented ...

...some suggestions and bugfixes from Jaex. Tidied code.