2809 error on no data flag

+ a few misc clean up items