Feature/make robust

Various improvements for robustness and performance.
Did we agree to support a specific minimum SDK?

I'll ask.