misc fixes & updates