some escaping and fixed uploads in progress