some fixes & updates