Still improving reliability...

Several small changes.
I think it's almost ready for V1.0