Bug fixes and performance improvements

Hello Kiwier,

We're listening to your feedback and working hard to improve this version
We love you Kiwier,