Few corrections - still fully tested