add imgs, some improves