small fixes and notices handle