Finishing up uploads, and fixing groups !!!