nothing major...
A lot of error checkig added, and some few minor fixes