some fixes & all