restored remote images + cosmetic changes