Better Images
and other changes