added fendona activities, cleaned up uploader