Added checks, upload partially fixed