some fixes & extended interface