Couple of changes

Mostly images