General code cleanup
Added UploadController, fixed multievent issues.