import updates and minor image path fix