Many improvements, mostly errors fixes, but increased code Quality too.