some minor fixes, and also, some major ones.

Hello Ralt,

Please take a look at the modifications.

We can discuss this further.

Samuel