Improving uploaded files handling, better vars