nag fixes + image path fixes