file uploader works with groups

plus a little code cleanup