made notices & errors smoother