External upload folder and minor cleanup
Add TODO