fixed some uploading stuff
Merge branch 'master' of https://github.com/shedelj/Oceanic-Scales
various tweakingswq