misc fixes & stuff