Add overall timeouts

created timeouts and ensured that we remove results after upload
made alphabetical