updates + fixes (with DAN and PNB)