I know this is quite late, but I have finally uploaded a build that addresses all of your issues. Thanks again for the feedback!
Tried it again, worked way better thsi time! :-)
