some fixes & testing