improved uploading regexes