some fixes & tests added