Great. Any ideas/pulls appreciated! Separated upload control would be fine, but I thinks it's difficult to make is KISS, reusable and also working properly with easy, but flexible setup.

Just fix this line and that typo so I can merge it.