a few last min needed bug checks