Add images and fix expansion to fptp