some temp fixes & updates