images and stuffS
merge fix