Here are some bug fix and corrections patches.

This is my first attempt, so please forgive errors and let me know if there is any problem.

B.