Tweaks to extension methods and added a couple of settings for ImageGen (still loads to add!)