fix on images and code clenup